keyboardManager: Adopt to changes in meta_display_freeze_keyboard

diff --git a/js/misc/keyboardManager.js b/js/misc/keyboardManager.js
index acc7eecc9fab030e2b03ada70bbb0f6d48a5a16e..e8a3e781ec6eb014983b0071899d4375b2633d4e 100644 (file)
--- a/js/misc/keyboardManager.js
+++ b/js/misc/keyboardManager.js
@@ -35,7 +35,7 @@ function releaseKeyboard() {
 }
 
 function holdKeyboard() {
-    global.freeze_keyboard(global.get_current_time());
+    global.display.freeze_keyboard(global.get_current_time());
 }
 
 const KeyboardManager = new Lang.Class({

diff --git a/src/shell-global.c b/src/shell-global.c
index d90ceaff888bafe8906f8c79a1adf539a55b7ef3..e9c60bff758d26addcfca97c28be7aab2ed5336a 100644 (file)
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -1132,14 +1132,6 @@ shell_global_end_modal (ShellGlobal *global,
   sync_input_region (global);
 }
 
-void
-shell_global_freeze_keyboard (ShellGlobal *global,
-                              guint32      timestamp)
-{
-  if (global->stage_xwindow != None)
-    meta_display_freeze_keyboard (global->meta_display, global->stage_xwindow, timestamp);
-}
-
 /* Code to close all file descriptors before we exec; copied from gspawn.c in GLib.
  *
  * Authors: Padraig O'Briain, Matthias Clasen, Lennart Poettering

diff --git a/src/shell-global.h b/src/shell-global.h
index a5630ecd37f1f015455ed858e47977409b4918c6..4a03087b9fbc7b2dc8be96cc9b0c488a719c42bb 100644 (file)
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -45,8 +45,6 @@ gboolean shell_global_begin_modal            (ShellGlobal         *global,
                                               MetaModalOptions    options);
 void     shell_global_end_modal              (ShellGlobal         *global,
                                               guint32              timestamp);
-void     shell_global_freeze_keyboard        (ShellGlobal         *global,
-                                              guint32              timestamp);
 
 void     shell_global_set_stage_input_region (ShellGlobal         *global,
                                               GSList              *rectangles);